tests: fix the HSV tests

diff --git a/tests/hsva.c b/tests/hsva.c
index ef5c111283001bd0800d62b9ebf16b393a2cb38b..a973ea5fdce2fed1670c847e9b9840827a4dd3e6 100644 (file)
--- a/tests/hsva.c
+++ b/tests/hsva.c
@@ -60,37 +60,57 @@ main (int    argc,
 {
   int OK = 1;
 
-  float rgba[][4] = {{  1.0,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   0.5, 1.0}, {  0.0,   0.0,   0.0, 1.0},
-                    {   1.0,   0.0,   0.0, 1.0 }, { 0.75,  0.75,   0.0, 1.0}, {  0.0,   0.5,   0.0, 1.0},
-                    {   0.5,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   1.0, 1.0}, { 0.75,  0.25,  0.75, 1.0},
-                    { 0.628, 0.643, 0.142, 1.0 }, {0.255, 0.104, 0.918, 1.0}, {0.116, 0.675, 0.255, 1.0},
-                    { 0.941, 0.785, 0.053, 1.0 }, {0.704, 0.187, 0.897, 1.0}, {0.931, 0.463, 0.316, 1.0},
-                    { 0.998, 0.974, 0.532, 1.0 }, {0.099, 0.795, 0.591, 1.0}, {0.211, 0.149, 0.597, 1.0}};
-
-  float hsva[][4] = {{    0.0,   0.0,   1.0, 1.0 }, {    0.0,   0.0,   0.5, 1.0}, {    0.0,   0.0,   0.0, 1.0},
-                    {     0.0,   1.0,   1.0, 1.0 }, {   60.0,   1.0,  0.75, 1.0}, {  120.0,   1.0,   0.5, 1.0},
-                    {   180.0,   0.5,   1.0, 1.0 }, {  240.0,   0.5,   1.0, 1.0}, {  300.0, 0.666,  0.75, 1.0},
-                    {  61.796, 0.779, 0.643, 1.0 }, {251.130, 0.887, 0.918, 1.0}, {134.919, 0.828, 0.675, 1.0},
-                    {  49.459, 0.944, 0.941, 1.0 }, {283.690, 0.792, 0.897, 1.0}, { 14.341, 0.661, 0.931, 1.0},
-                    {  56.909, 0.467, 0.998, 1.0 }, {162.413, 0.875, 0.795, 1.0}, {248.303,  0.75, 0.597, 1.0}};
-
+  float rgba[][4] = {{ 1.0,   1.0,   1.0,   1.0 },
+                     { 0.5,   0.5,   0.5,   1.0 },
+                     { 0.0,   0.0,   0.0,   1.0 },
+                     { 1.0,   0.0,   0.0,   1.0 },
+                     { 0.749, 0.75,  0.0,   1.0 },
+                     { 0.0,   0.5,   0.0,   1.0 },
+                     { 0.5,   1.0,   1.0,   1.0 },
+                     { 0.5,   0.5,   1.0,   1.0 },
+                     { 0.75,  0.25,  0.75,  1.0 },
+                     { 0.627, 0.643, 0.142, 1.0 },
+                     { 0.256, 0.104, 0.918, 1.0 },
+                     { 0.116, 0.675, 0.255, 1.0 },
+                     { 0.941, 0.783, 0.053, 1.0 },
+                     { 0.704, 0.187, 0.897, 1.0 },
+                     { 0.931, 0.463, 0.316, 1.0 },
+                     { 0.998, 0.974, 0.532, 1.0 },
+                     { 0.099, 0.795, 0.591, 1.0 },
+                     { 0.211, 0.149, 0.597, 1.0 }};
+
+  float hsva[][4] = {{ 0.0,   0.0,   1.0,   1.0 },
+                     { 0.0,   0.0,   0.5,   1.0 },
+                     { 0.0,   0.0,   0.0,   1.0 },
+                     { 0.0,   1.0,   1.0,   1.0 },
+                     { 0.167, 1.0,   0.75,  1.0 },
+                     { 0.333, 1.0,   0.5,   1.0 },
+                     { 0.5,   0.5,   1.0,   1.0 },
+                     { 0.667, 0.5,   1.0,   1.0 },
+                     { 0.833, 0.666, 0.75,  1.0 },
+                     { 0.172, 0.779, 0.643, 1.0 },
+                     { 0.698, 0.887, 0.918, 1.0 },
+                     { 0.375, 0.828, 0.675, 1.0 },
+                     { 0.137, 0.944, 0.941, 1.0 },
+                     { 0.788, 0.792, 0.897, 1.0 },
+                     { 0.040, 0.661, 0.931, 1.0 },
+                     { 0.158, 0.467, 0.998, 1.0 },
+                     { 0.451, 0.875, 0.795, 1.0 },
+                     { 0.690, 0.75,  0.597, 1.0 }};
 
   babl_init ();
 
+  CHECK_CONV ("rgba to hsva ", float,
+              babl_format ("RGBA float"),
+              babl_format ("HSVA float"),
+              rgba, hsva);
 
-  CHECK_CONV("rgba to hsva ", float,
-      babl_format("RGBA float"),
-      babl_format("HSVA float"),
-      rgba, hsva);
-
-
-
-  CHECK_CONV("hsva to rgba ", float,
-      babl_format("HSVA float"),
-      babl_format("RGBA float"),
-      hsva, rgba);
-
+  CHECK_CONV ("hsva to rgba ", float,
+              babl_format ("HSVA float"),
+              babl_format ("RGBA float"),
+              hsva, rgba);
 
   babl_exit ();
+
   return !OK;
 }